from trunk
authorKenichi Handa <handa@m17n.org>
Mon, 18 Jan 2010 01:19:32 +0000 (10:19 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 18 Jan 2010 01:19:32 +0000 (10:19 +0900)

Trivial merge